fix performance degradation on handling conflict fields #212
+75
−12
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.